build: Unconditionally append kmod feed for BuildBot

Recent changes to BuildBot config moved the kmods to a dedicated
directory and dropped them from the packages dir. This was needed as
both OPKG and APK gets confused if both entry are present.

To fix this, unconditionally append the kmod feed line if
CONFIG_BUILDBOT is enabled.

Fixes: #17146
Link: https://github.com/openwrt/openwrt/pull/17151
(cherry picked from commit 53ee2e8c0339c1d7ace47b8cf390147b86ea8d1d)
[ fix conflict error for missing APK support ]
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/include/feeds.mk b/include/feeds.mk
index 632fecb4a3aaece1cada2b8d2ae089c85dc2d1a6..a4997144317155a157bf2a8890dca63372d661ac 100644 (file)
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -33,7 +33,7 @@ define FeedSourcesAppend
   echo 'src/gz %d_core %U/targets/%S/packages'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
        echo 'src/gz %d_base %U/packages/%A/base'; \
-       $(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+       $(if $(CONFIG_BUILDBOT), \
                echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
        $(foreach feed,$(FEEDS_AVAILABLE), \
                $(if $(CONFIG_FEED_$(feed)), \